#58 initial fix for 100 and 690