Fix for issue #263
Trying to fix issue #297