resolves SPOT-1740