Closed #11 , fix courtesy of @jeffhammond