This is for issue #481

Done