Bug fix #453