More of a fix for issue #814