[20180719231503] Bug Fixes