fix for "issue" #149