#54 fix attempt