Fixes #SSEER-43