Fixed shameful crash