fixed to work with library mirror changes