Finally fix #334