[20180411153554] Bug Fixes