Fixed bug waiting to happen