fixes # 19