fixing optional features