#26 fix