Slight Bug Fix