#50 fix