- Fixed #310