Fixed #503