fixed bug introduced somewhere in master