#27 fix