 Different from #500 - - this bug should be easily reproducible and hopefully there is a more straight forward fix