Fixes bug caused by bug fix for bug fix