[20180420210156] Bug Fixes