Bug Fix by Jenny

Final fix