Should fix #625.