#master: better check