[20171122125953] Bug Fixes