resolves SPOT-1793