Apply workaround just for null value