Fixed API dependencies Fix issue #490