Dev

Test and proposed fix for issue #326.