Should fix #572