Fixed rare problem with controllers