Add check to stop crazy behavior