Fixed showstopper bug