fixing #51