Null deck problem fix