fix bug in previous commits