Board Thread:General Discussion/@comment-31780004-20171226204957/@comment-34834173-20171230165050

Some bug fixing which PR always does.