update for R15 compatibility