try to fix #28