attempt to fix #325