[WIP] Fix  #1199

Should fix the issue #1199