implementation of issue # 215