#403 - fabbot patch