FW-246. Fix?