FW-312 compile fix