maybe fix null application bug.. almost impossible to test