Fixed problem with after/before.