Fix # 58