[20171201042926] Bug Fixes