v1.1.0a change still doesn't work for monster, TODO this.