Voxbox merge fix