quick bug fix after unexpected merge