#26 fix attempt 2