Fix for issue #69. Problematic.