Fix #1243 (SF196)
Fix #1243
Final fix #1243