still fixing #43