<return null> bug fixed