Fixed API dependencies

Fixes issue #490