Bug fixes on option B