Fixes issues introduced by previous commit