resolves SPOT-1469