Fixed Chris' invalid merge