Minor bug in previous fix