Fixing template block issue