try to fix #21