Fixed #35