Fixed a showstopper bug