fixed issue 1295, more git issues, thanks Alan