FW-309. Fix.

Fixing FW-309.