issue # 242