fix from cshelton