Issue #1052 - FW part
Fixes #1052