more fixed #43