Resolving (hopefully :/) node bug CLB-245