Fix for afterbuild