Fix #503