Slight modification that I forgot to remove before the last commit. #21