Try to fix #329