[placeholder addon] Fix corner case