Fixed issue that popped up from last fix