Fixed singleton
Avoid undefined block/3