Fixed something Matthew complained about