resolves SPOT-1656