Debug: Removed "return false"