Trying to fix hereinafter problem