attempt to fix #226