Fixed bug in After