fixed big scary black box bug