Should fix #538.