Second attempt to fix #376