#78 fix attempt 1