Fixed bug, can't add after/before