Fixing issues with @036f839