implementation of issue # 235