another attempt to fix #11