[20161006183008] Bug Fixes