resolves SPOT-1473