Fixed #32 (finally!!)