Fixed #56