Try to fix #582