master: 873bb8c716e7937e2be2c593658fa8e36c17aad5 Fix pointer