Applying changes from PR 450