it'd be good to fix in separate commit