solved context issue completely, resolved #20