Fixed #55 without being drunk