bug fix for f969ad6671a077098a856be544c3a9f79838f58d