Fixed optional behaviour - is now really optional