fixed, contribution by danly7