should fix #536