fixed #20
regression from 4d237918