fix for issue reported by Geremy