Third attempt to fix #376