Bug fix to remove hardcoded geometry