Quick Bug Fix