Closing #494, Closing #484