Fixed @mattbasta's bug from commit e35eeb11