Fix for #405

Fix confirmed bug user in original bug report