[20180928123716] Bug Fixes