Trying to fix #772