bugfix undefined -> null