Fixed no-tail bug