Big bug small fix