goal is to fix #559