Working on #1063
More work on #1063
Merge branch 'fixing_1063'