Quick and dirty bug fixing.