bug fix for all options