attempt to fix #27