fixing #1024