catastrophic bug fixed