resolves SPOT-1809