Temporary fix for #143. Fixes #143. Will be updated when REST update is pushed
through.