[20171116140334] Bug Fixes