Attempting fix for #568.