Fixing bug on @after/@before callbacks