temporary fix (hopefully!) for Ben's bug