- Fixed issues #287, #286, #285, #284