0.6.5+ fix