Fixed #21 in original repo