this will no longer be necessary when #248 is merged