Fix for issue #292

Fix for issue #292