Fixing placeholder checking