Use a location instead of a block for better reliability