fixing #1402