Bugfix, behavior might be NoneType