fixes #32 . take a rest for now. Will continue later when apiary update.