#54 fix buggy version