fixed annoying crash