Should fix #529