bug: check for None