implementation of issue # 210