Should fix #523