[20180221154958] Bug Fixes