[20180907231934] Bug Fixes