* another attempt to fix #22