Fixed context path issue for distribution