This is for issue #481

#481 Done