Super Quick Bug Fix