Fixed the same bug as last time