quick fix ==null