Fix for issue 453