Issues/32 fix 30