Fixed passing of options