issue # 9 and 20 fix