Pull request for #489