#40 fix