possible solution to bug # 1 -> oops