fixed to run with new SDK