attempt to fix #11