FIX: the refactoring wasn't working. works now