Continue fixing #32