[20180721021022] Bug Fixes