Trying to fix #574