Fixed #32 manually