fixes # 6