Dev

Fix for issue #1284.