Bug Fixed: Do not take the end with