One more fix for the refactor