#25 fix attempt 2