Try to fix #45